From 7d7721d98312ff8bc412b4eea7a43b4d2ede4ff2 Mon Sep 17 00:00:00 2001 From: "vhanquez@kneesa.uk.xensource.com" Date: Wed, 1 Feb 2006 17:06:16 +0000 Subject: [PATCH] Permit compilation of HOTPLUG_CPU on i386. move the entry into another menu that is not !XEN_PRIVILEGED also, add HOTPLUG_CPU back into i386 domU default configs. Signed-off-by: Vincent Hanquez --- buildconfigs/linux-defconfig_xenU_x86_32 | 1 + buildconfigs/linux-defconfig_xen_x86_32 | 1 + linux-2.6-xen-sparse/arch/i386/Kconfig | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/buildconfigs/linux-defconfig_xenU_x86_32 b/buildconfigs/linux-defconfig_xenU_x86_32 index ca3b4eb52c..b59f48dc13 100644 --- a/buildconfigs/linux-defconfig_xenU_x86_32 +++ b/buildconfigs/linux-defconfig_xenU_x86_32 @@ -148,6 +148,7 @@ CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set CONFIG_HZ=250 CONFIG_PHYSICAL_START=0x100000 +CONFIG_HOTPLUG_CPU=y # # Executable file formats diff --git a/buildconfigs/linux-defconfig_xen_x86_32 b/buildconfigs/linux-defconfig_xen_x86_32 index d65dd36832..68c7ff0cf5 100644 --- a/buildconfigs/linux-defconfig_xen_x86_32 +++ b/buildconfigs/linux-defconfig_xen_x86_32 @@ -156,6 +156,7 @@ CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set CONFIG_HZ=250 CONFIG_PHYSICAL_START=0x100000 +CONFIG_HOTPLUG_CPU=y # CONFIG_CRASH_DUMP is not set # diff --git a/linux-2.6-xen-sparse/arch/i386/Kconfig b/linux-2.6-xen-sparse/arch/i386/Kconfig index ed2f462854..0f96825466 100644 --- a/linux-2.6-xen-sparse/arch/i386/Kconfig +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig @@ -1014,6 +1014,16 @@ config CRASH_DUMP depends on HIGHMEM help Generate crash dump after being started by kexec. + +config HOTPLUG_CPU + bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" + depends on SMP && HOTPLUG && EXPERIMENTAL + ---help--- + Say Y here to experiment with turning CPUs off and on. CPUs + can be controlled through /sys/devices/system/cpu. + + Say N. + endmenu @@ -1305,15 +1315,6 @@ config SCx200 This support is also available as a module. If compiled as a module, it will be called scx200. -config HOTPLUG_CPU - bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" - depends on SMP && HOTPLUG && EXPERIMENTAL - ---help--- - Say Y here to experiment with turning CPUs off and on. CPUs - can be controlled through /sys/devices/system/cpu. - - Say N. - source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" -- 2.30.2